fixed few gotchas with the lastes merge