fixed a couple crashes and logic bugs