Fixed up stomp parser a bit.