fixes and api changes