Amended a bunch of codes in the 3 files to match the final flow of signing in
Merge branch 'master' of https://github.com/Zerith90/IS480