Bugfix: column names were permuted according to rows, fixed; 
updated TODOs