Committing the forked files
Minor clean-ups