Now come code changes

[Christian Hammers]

Hello

My remaining changes affect actual php code so please start having an
eye on the commit message! :)

bye,

-christian-