misc changes

-kyle
new cluster mapping