fix stuff and things caused by the rebase