Fixes and iTerm2 setup conf