many small edits. deleted the old stuff too