Fixing bugs and moving things