Done some tweaks