Removed some commented code, a fixed todo and fixed some spelling mistakes.