Update v2.3b

Merge of all the fixes from Max & The perk machines update