- removed hgroup
- added main
- misc improvements