Updating documentation, cleaning up TODOs.