Tided this up a little.
I wil work on ChangeLogs at a later date.