various fixes. Still not working