Bunch of things

Started as a cleanup but ended up implementing the things I had filed for before