Add some more calls and a few bug fixes