Tier 1 done
Tier 1 fixes