improved new, updated modules; bootstrap