May walks and more fixes