header design, minor bugs