Changed levels, fixed some stuff, and auto indented the library
Merge remote-tracking branch 'origin/master'