removed includes; fixed header/footer