initial pulling stuff and various other fixes