Minor tweaks
Updated doc blocks
Handler cleanup
Updated change log