improved dash & xcode support