general clean up; added config.h