add header, minor fixes