Updating TODOs and fixing some small bugs.