Added TCLAP and bashed more keys.