fix a few bugs; finish atlanteum