minor changes/fix