some minor tweaks and fixes
final before submission