Tidying up the aware repository
Fixing bug with xAutoScale