small changes/fix