Pinball and small fixes