Fixed bugs with account loading, updated api