added client project, some fixes