wip comments
Address GitHub comments