Rewamp - additionl changes

See changed files for more info as this contains various changes/fixes ...