Various MCPE tweaks and additions to reflect structure changes