Added extra credits and cleaned up some stuff (as usual...)