trades tweaks and fixes