random bugfixes
yay bugs
yay more bugs
even more random bugfixes
i love writing commit messages -_-