Finished tightening up the APIs