fixes and style updates