added some more mods

I took the liberty to add some more mods.

Some already use the cleanup feature from my other pull request, but the current code does simply ignore it - so no harm done.