Final commit for the night there are various changes.