Develop - updated authentication and other related 'fixes'