fixed header and assorted things