removed / editted some stuff