minor improvements for BufstopMode - fixes #4