Reduced some double checking
Added some more notes