added compdef for s
various updates