Moved some things around, re-added signed/unsigned conversions