Minor updates to Linestorage, Makefile (Exception testing)
Merge branch 'CEW' into LS