more mob stuff and other imporvements