more pubbing annoyances solved