first commit
Minor fixes