More API clean ups and some styling fixes :-)