merge and fixes