Some changes and stuff
buncha stuff