-- MTE-4, more fixes to code