changed a few stuff