some vague fixes
merged