All commands fixed. needs exhaustive testing, but passes intial tests.