Added error and movement controls