Fixed SDEV-307, SDEV-398, SDEV-309

Reformatted CSV data, added new field and fixed nonetype bug