set reader now working, some cleanup