Changes to pretty up logging and more closely work with website.