Changed command return values to be more consistent