all kinds of fixes to make this actually work as intended
version bump