Added additional features and changed UCTC a little.