block scan working, other minor improvements