Add collision with some bugs