fix reference to Top instead of Maml
add support for (unnested) comments