various updates

latest commit 1d5ac831c5
@zalewszczak authored