add -servlet to generated servlets
fix servlet templates
replace servlet gen logic with call to make-servlet
misc. fixes