org: autoload more, and tidy