A few updates and bug fixes.