Updated TODOs and feature list