Updated some comments, removed the inline code.
Removed C extension tasks, not needed for this branch.
Started updating tests.