headers working, some minor tweaks