Fixed commands being out of order and thus broken