Some improvements
Fix