tiny tweaks to template files, add logging, update editor to use amazon instance, etc