removed pass bug; misc cleanup