True authentication. Small bugfixes.