Improved some docs and naming.