work in progress - fixed issues

Signed-off-by: Raf <7909000@gmail.com>