Merge in changes from TechNut/BaseMod

Keep this fork up to date within reason