improving shutting down
improving module rendering