ALOT OF FIXES