Bug fixes. Integration testing complete.