now able to return all results; cleanup