More work on axwin, and slight changes in othe places

UCC git Repository :: git.ucc.asn.au