BichoReader and CVSAnalyReader changes. Pretty much finished.