other minor changes!