various changes playing around with more js