various changes from a while ago I dont even remmber what