bug fixes and performance improvements. he/him