Bug Fixes and Bug Fix Attempts

Fixed a few bugs
Made some changes to fix the "wait" window bug on the cloud (we are not
able to reproduce it locally)