Error Removal (with some differences)

A slightly faster tempo and some other things that weren't changed in the final version.