Fixed some more errors.
I seem to be working on T_TRADE again. Yeah! :)