done fixing some small things