fixed bug, removed echo, removed mac settings