Adjusted some points based on comments