fixes, added reader support