minor improviments