Fixed many stuff