EntityLayers, bouncy words, various changes