I pushed a new version which should address your comments. It also removes a bunch of short lived objects.