multiple fixes, including auth