Initial changes to files in place
fix comment