Fix some Fails an Check and recode some things