bug fixes
performance improvements