some fixes
s to much :o