fix some more bugs again