Planning_update

Update planning and fix small typos