some updates to slave buffer mode