changed a lot of thingz around

changes