starting on 1.13 progress again

bad merge/compiler error fixes
mostly 1.13 inventory progress
21 files changed