Implemented moving blocks, misc cleanup