bugs arrrrggggh

no live events here, just multiple bugs fixes