Some clenaup and fixes

If this eventually gets accepted, I'll also update the doc on dartlang.org, ping me.