updates and bug fixes

Signed-off-by: Marcin Wiatr <mail.wichura@gmail.com>