clened project;
minor changes