last edits closes #362 #360 #120 #7