Changed main class name and a few misc changes