Update and improvements

New features.