Add comments
Move all configuration into Config.h