Many small changes, fixes prompt.sh