Authentication works, some little changes
authentication fix
auth before merge