More changes to accomodate new override structure and general tidying up. i_tradePeriod aliased with tp, i_offer aliased with o and o1, i_tradeBlock aliased with trdBlk. Overrides working now for all offer types - code dramatically briefer due to introduction of set fromTo with elements frm and to, i.e. no need for all the fromData/toDate symbols.