Minor changes, ready to export to csv (#1)