Updates to overall structure, a few description fixes, and a few fixes to problems