fixed return problem and the administration part