More fixes

and less derps, trying to fix #17 still