added some tweaks and plugins