Mismah of bug fixes and improvments including a significant performance improvement