Some more stuff fixed