* some more small fixes