fixed some bugs, began adding atlas support