Fixed null token issue when using remember me, reworked/tweaked some object methods