more editing. hopefully fixed encoding issues