Added main source file
Minor changes