styling and api changes