Bug fixes, in structure base package

Updated several bug fixes that were located in base of structure package