Authentication fails actually work
Cleanup and small fixes