Corrected the include paths and added a few comments