corrections
fixed errors
templates: finished except helper to arrange