Stying and api model tweaks.