even moarrr bugfixes