fixing some last details