1-21 and some 1-20 cleanup