Fix daft errors and first commit from neutrinos8