styles and bug fixes