technical updates and improvements

technical updates and improvements