More changes to get the repo commited to master