fixign more stuff i guess