-some minor changes