Small changes and bug fixing
Fix git