some tweaks on client project