removed debugging; some upmerges with no big effecs...