improve signals again & delete old comments