removed development code, add in remaining UTF-8 codes