Fixed server error due to tpl mismatch, improved documentation