template fixes
te,plate fixes
fixes in field parsings
template fixes