improved some templates; continued warp template