Small changes to headers and a few other things, also merge my TODO into this branch since it's likely going to get rebased into master anyway