Added signal handling and messages