Changes to collision (+collision function for compnents)
more hacks to the component/entity system