Add some more docs, fix template