Update libraries
Remove my own mio hacks
Merge branch 'updated'