Fix freezing in #127
Fix CSV loading