Some tweaking ; added config files