Fixing build, Adding comments