some more changes from dhollmen