fix inclusion and formatting, update dojo