forgot some stuff; fixed some stuff