Now using config.h
Various small changes.