Added signal traps and removed auto update (took too long)