switched the names a bit and fixed some stuff