first improvements on the velocity templates