bugfixs
better templating
better documentation