Added some notes
Fixed elusive bug