Homebrew

& minor changes