minor changes to behavior