Renamed config to be clearer. Added more TODO's for the future. Updated readme