Renamed variables, corrected find method

don't think find() is write way for getting all, haven't tested.