Fix config file read & mark TODO