Major Update

major fixes required for users to work correctly