some more stuff fixed