Bug fix, more changes.