Amended config descriptions and added some TODOS