Wait instead of returning only available data in read

This addresses commment from @Icewind1991
Changed where possible names to cameCase

This addresses comment from @Icewind1991