Authentication works, some little changes