Bug Fixes, Refactoring, Wait Cursor, Optimizations