Fixed loading from config file. Listed a few more TODOs