fixing some of the details