Tweaks to make files closer to master-0.3 and add comments