some small changes
template