added some error messages
fixed merge issue
Fixed unique strings in string pool
Merge branch 'lab_4' into lab_5
worked some more