minor changes to source