Style Tweaks & Some debugging - Ready to go