Adding Simple CSV parsing & minor fixes