Removed more definitions from conf.hpp.
Re-done some debugging code.