Adding main and fixing spacing bug