Multiple IPStack Related changes (and other bugfixes)

UCC git Repository :: git.ucc.asn.au