Fixed ALLLLLLLLLL bugs