fixed comments and includes