all fixes

Signed-off-by: bttalic <b.ttalic@gmail.com>