A few updates. Bug fixes.