tidy up todo list and improve config file