added ability to search for things without the proper dashes everywhere + code cleanup