a bit of cleanup after merge and fixes