Added settings & fixed encoding error