more stuff fixed