Various fixes and improvements

![Here it is](http://t.wallpaperweb.org/wallpaper/miscellaneous/1600x1200/Jack_Rabbit_Trading_Post_Sign_Joseph_City_Arizona.jpg)