final party and fixes