removed many TODOs, applied spell check on it