add elixir, some changes