added some tweaks and mirror