bugfixes, better styles