fixed missing collision term, decoupled draw and update