finishing touches
ha
fixed various problems. hoping for a late partial credit
merging