more libs and corrections on index