some tweaks..