merged tweaks from old deploy