YetiParty: Day 1 fixes!

Minor bugs fixed, optimization improved