fixed some naming bugs
a few work in progress utils