minor fixes/improvements; doc & templates update