Fixed some searching issues and added Main class
Fixed some searching issues and added Main class