* Fixed some stuff and cleaned up the code.