few improvements + auth massive refactoring