Potential fix to an "out of sync" error. Added some TODOs too