Better message parsing & overflow handling