changed a few things, im not sure what to commit anymore...