use checkout of moxie and other small changes