updates for 0.22 tidyup of js files