A small step towards a node-like module.
Minor changes