Pbe updates

LOL ... I was reviewing this when my :dog: ran his :paw_prints: across my keyboard and submitted this !  Well it merges although I may have some more at some point, but my :dog2: is right, I need to look at something else for a bit!