lot of wrangling, basic issue editing, closes #4