change around commands, add some affection