cleaned everything up, compiles without error