A few more edits to occupation data manipulation