Changed cross and fixed small bugs