Small aesthetic improvements and bug fixes.