Added main project
some fixes