Updated touches, fixes and polish.