Makaba reading support + fixes