Minor bug fixes and a csv update