naming cleanup, security work for apis, template improvements, etc