Lots of Commentings, some more organization