Updates

Latest features and improvements