fixes more stuff