style updates, api fix