Adding main method and patching various small issues