Fix conditions

Everything works, code still unclean, partyframe classes could use
re-positioning