0.6.6 - performance and code cleanup