Bugfixes, readability