Fixed backticks and datetime.
Fixed more docstring ans typos as Bryan suggested.
Do not document 'private' args in docstring.
Merge-in big refactor. Fixed conflicts.