many updates and style fixes

template updated