Re: Issue #129 update features and other cleanup