Final run through and fixes