some tweeks
fix subArea area :S. More templates.