Last changes before I push it to the site

At the moment, done is better than perfect. :)