Added revive+ mode and configuration
Added buffer-move mode