Fixed include, added comments