fixing some, and adding some