Babel improvements and OpenFlow

These commits look fine to me, but somebody else please review this as well and note any issues you see. Thank you.