more inline. rm old js
rez merge conflicts