I've made several small changes, have a look

Check the commit log for the details.