fix in more stuff