further testing, all working now