More comments added, move #include