fixing double substitution
PR feedback, plus quick section on loom_base