ALL TEH FIXES