Bug fix, minor feature update