- bugfixes round 1