Commented and added some multiple-file edining helpers