A few more changes
Merge github.com:bhargz/cm10_htc_pico