lots of updates, added csv add