couple of fixes still not working