Updates to user manual (WIP)
Better naming.