Fixes and cleanup

Some fixes and clean up. Is slower now somehow....

Initial release

This release works for my application case, so it maybe helps someone else. Things could still break!