fixes and performance, close #96