Fixed entry points from main()

-Manan