Switch to source.
Bump to API 10.
Merged in fixes from @softlion