Fixed cloud bug, more cleaning up.