various changes
Merge branch '6.0' of github.com:thasmin/Podax into 6.0