Improved comments, pulled completed TODOs.