more bugfixes
unshittify