Fixed EVERYTHING

EVERYTHING....