Add new Give/Take arguments to CommandRegistry, more fixes