Fixed the classloader and added other stuff