Rolled back to 1.5.1...
Cleaned up a bunch of code.