Some basic changes that hadn't been submitted yet. -EJB