Varous bugfix and mirror module added