Updates and tweaks for 1/21 class