Numerous profile changes and improvements