refactored the return results a bit. see github issue #3 for resoning and current issues