done tweaking. also removed experiment code in previous commit