FIXING EVERYTHING

A lot of changes