minor overall changes