Did some minor changes, now carrying on the testing work.