Fix 21 and complete 23-27