Some stylization and bug fixes.