Fixed most stuff