more collision fixes, everything working