1) I'll try to fix it.

2) Corrected, thank you very much.

3) The first option was like you describe, but something I did not like about it - I'll think about it :)