Removed compilation errors and commenting errors