Development branch commit
Minor fixes and cleans