rm'd some stuff and fixed some copy