fixing some things up