finalizing core controllers
cleaning, rebase prep