Silly Tres, so many errors! Part 1 of the bug fixes.
If all this turns out to be of some great scheme that I have not been informed of, this commit will be reverted.