some tweaks :D