Code Clean UP P4

Errors: Able to control shadowblock after normal block has been dropped.
Then pivot gets messed up.