fixed some bugs and added notes for others