Some fixes (typos and planning)