fix #14, fix #15;Added Authstore and performed cleanup