Small changes and bug fixes

Signed-off-by: bregell <johan_bregell@hotmail.com>