bugfixes + design