addressed basically all of the review comments