Fix for 221 and some auth consolidation/refactor