More work on uber commands, testing looks good so far
Fixed custom commands, was not working properly in 2.0 code line