minor changes
refactoring project handling