Most collision bugs fixed, still a few bugs though