Added a few more specific comments