Added missing signals and fixed random Sweet