Minor changes
final tweaks