style improvements bugfixes