added default templates and cleaned things up