changed csv parser
minor changes
cleaning up