Cleaned up the workspace. Changed some shifting stuff.