Issue #36.

I have converted most todo's from code into proper
GH issues.