Several updates in localization, state machine, soft vs. hard cspace, etc.