Address concerns. updates #88