Fixed rare UnicodeError related to actor names + general cleanup