changed a few things..