Improvements in docs and template