Fix argument ordering, improve export list.