Fixing typos when now testing
Be more conscious about timing in Dock and Undock tasks