last fixes to #134, did some more testing, all done now