uglied up some implementations; removed vestigial addOne function; re-docco'ed