fix typo
Clean up comments, moved cache into client, it may need to come back out to controller though.