style updates and bugfixes