more changes - before applying the rol instruction fix

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