Plenty of updates

Tweaking, fixing, cleaning, etc... :)