Reworked command line options, adding host name
Enhanced metadata collection (added freebase) and title matching