bugfixes
better styling