styling, minor bug fixes