small fixes and oversight corrections