comment adding, security improvements