Updated some stuff, added comments