fixed some stuff, and renamed