Fix 1 done
Fix 2 done
Fix 3 done
All fixes applied!