Adding final fixes and tidy up