final merge fixes

-- less of a mess
-- commented out my debugging println's