Updated, completed, and refactored USI mods

Hopefully not stepping on @BobPalmer's toes...