Additional features, bug fixes.