fix ocamldoc comments
bump version number to 2.1
handle namespaces, store them in channels, use them when writing