Fixed derp, rendering some commands unusable - I should check my code better...