more Base.pm updates