New Command, more fixes, derps.