Fixed collision

collision now works and more collision states can be added with custom
timeouts