Big update part 3 + bug:D

Signal is bugged for some reason.....