Some minor modifications + start of CSV TABLE