additional comments, build config changes