stuff that @mokus80 didn't let me finish

@mokus80 @queenfrankie

this is purely suggestive, do not merge.. rather pick the parts that you need.

**PS**: you girls should care a bit about spaces, line breaks & writing comments. If you were working in a team, most folks would be unhappy with the missing comments.
If you'll look at the code 6 months down the line, you'll be unhappy yourself..
So, please write comments (& maybe specs too).