bug fixes and optimizations.