major fixes to adding/removing doc