Bug fixes from abstraction and example CSV