update filepaths and todo