fixed some more stuff