First half correcting bug in Inductive Phase, plu many other minor changes