Fixed return codes & modified enabling of user