Bug fixes. Final touches.