Fixed friction, misc collision tweaks