Updated Armour and whole heap of other stuff
Signed-off-by: Nassar Zeitoune <almightynassar@gmail.com>