even more small fixes