[UPDATES] Fixes to many issues