Fixed stuff i don't even know
Merged files