Fixed code, added some stuff.