660 - minor performance improvements