spec updates and improvements