Minor corrections in expedient api implementation, heavily working on debugging stuff