Fixing return variables
Enhancing information gathering