Made some updates to make shit better