minor changes/ fixes