FIXES + STYLE