Fixed some problems with Reader; still buggy