New pokes and small fixes