changes to manta stuff
fixed merge conflicts