Adjusted some more things