fixed problems from weird merge...