fixing grunt, adjusting templates