intermediary reader/testing work, fixes and cleanup required