Fixed an issue where elements in the factor table couldn't be selected again even after a refresh.  Also added some TODOs.