aesthetic changes and bug fixes