disable debugging and improve api