Fixed bugs in core module
 final mods to the pod`