cleaned up problems from last merge