In this work we adopt the step-by-step framework of <cite>Moryossef et al. (2019)</cite> and propose four independent extensions that improve aspects of our original system: we suggest a new plan generation mechanism, based on a trainable-yetverifiable neural decoder, that is orders of magnitude faster than the original one ( §3); we use knowledge of the plan structure to add typing information to plan elements.