Bug fixes and some restructuring in the PbMap (class and examples)