minor tweaks and tidy ups.

Been a while but finally got around to this.

Sames changes that were originally emailed about at https://gitorious.org/branches-of-others/pingdom-kiosk/ , but now I have a github account I can request merge here.