Updates from Poyt, and fixed polaroids