Minor functionality improvements, and bug fixes.