Bugfixes and a re-implementation of quoted AKA