fixes and style