Bug fixes and optimizations...