Re-edit

forgot to save some changes, still probably needs some tweaking.  Still
working on the others.