Several improvements, eg DECLINETRADE working