bugfixes + prettifying stuff