bugfixes lol
merge