a few more small fixes.
finish merge