Updated comments and README

Updated with bug fixes