cleanup, authentication, router, better includes