Tweaks
Some much needed commenting