Minor updates/changes from original template