update+fixes+joriths additional code
partycharfix
Merge remote-tracking branch 'upstream/master'