Fixed errors and missing strings