A few quick fixes
blehbleh
Whee, finally getting autodetect to work!

Still some hackiness and things, but it works!