Some fixes and Tweaks

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>