base template renamed
minor tweaks