port to work with new tactics, fix some tactics.