Fixes to get a working version

Fixed some little issues to get it work.

Signed-off-by: FroznMine <pesafrre@arcor.de>