Yeah, Calibre is the way to go. KoReader is basically custom built for Calibre, and includes things (missing from the base kindle firmware) like native metadata retrieval.