auth and other improvements