Made latest bug fixes to TnT_final; fixed another bug
Made latest bug fixes to TnT_final; fixed another bug