Minor performance improvements and bug fixes #217

Closed jmdha closed 11 months ago