additional bug fixes, style updates