Some modules added, docs and tweaks