Fixed some classpath things, and updated a bit of code