Improved functionality of collision system, need PV fixes