Finished rebase, fixed linting