*I think I got most of the problem areas..

Some of the float stuff is still a little iffy, but seems to work on the
few tests that I ran.