updated collision and a few getters