added headers in lots of places