Some updates and improvements
Some updates and improvements