One bug fixed.  Major comments added