Fixes some initial errors but mostly good