styling, bugfixing