Some bugs eliminated.