Tried to track down source of anti-locking error... no luck so far, but cleaned up some of the code in the process.