change to ruby 2, small changes