add more comments
use standard ->output instead of manually hacking template