some minor improvements and tweaks. Bug fix on duplicating project