Init. version
Minor changes