First commit
Minor fixes