bug fixes and optimizations™