Docblocks added. Some small tweaking.
Couple of tweaks, mainly naming