tweaks to collision resolution & misc.