tons of little bugfixes