Cleaned out TODO list; items resolved.