modified classpath
cleaned up a few more oopsies