and again more stuff fixed