additional fixes for a smoother read