fixed more stuff again