Changes from latest "armoury" project + compiling changes