fixing some things I didn't like for now.