bug fixes and minor style updates