more changes from the packageman Frank Trampe