Added extension details and made TODOs noticable.