Undone some commenting / Fixed some includes

Titles says it all