organise config
now fully functional