small updates and api changes