small fixes
even more small things