Fix bugs. Minor changes.