some styling and bug fixes