add header
add other blocks
fix resources
small fixes
small fixes
Merge pull request #1 from fanian/master

merge