More features and bug fixes.