Ready for Demo! Fixed tons of collision bugs