Updated comments and include paths