Numerous updates - stuffed up my previous git commits???