Commented more files, fixed some editing