Fixed parties not being loaded at startup
+ minor cleanup