Small style and bug fixes.