Removed resolved TODOs.
Fixed logic for forcing a tick update.