bugfixes for random things