fix comments and typos
keep the moves segment locally
address a corner case where a place segment is available