Final commit of the day, correctiing minor issues.