added conditional TA1.8, variety of small changes