Fix title
Remove closing tags, add docblocks
Fixes #1083 - add default package name
Fixes #1051 - fix default/Default clash