Misc changes

Returning dictionary with values now. Added some more information