fixing all the things post-merge