Changes to fix issues from previous commits. Also fixed issues with places within places