fixing some last details 2