hopefully tackling some of those NPEs
Fixing NPE and shutdown issue
Some renaming, more info in CSV