fixes, features, etc
moving old parties to new ones
Merge remote-tracking branch 'origin/master'