adjusted some stuff