fixed more stuff, working