Fixed up collisions+rendering somewhat.