some small bugfixes. part 2 (i'm stupid)