Minor template update
Rake tasks improved