Added/tweaked some commands