Took care of some TODO's, made HadoopCatalog more configurable.