Corrected one serious bug and noted another serous bug