diff --git a/setup.sh b/setup.sh
index 9ddb294..5b7463b 100644
--- a/setup.sh
+++ b/setup.sh
@@ -77,7 +77,7 @@ CLONE_FROM_GIT=$1
 	if [ ! -z $CLONE_FROM_GIT ]; then
 # Preparing clone root directory
 	if [ ! -d $GIT_CLONE_DIR ];then
-		log "Creting $GIT_CLONE_DIR direcory..."
+		log "Creting $GIT_CLONE_DIR directory..."
 		mkdir -p $GIT_CLONE_DIR
 		if [ $? -ne 0 ];then
 			log "Can't create $GIT_CLONE_DIR, exiting!!!" 
@@ -131,7 +131,7 @@ CLONE_FROM_GIT=$1
 	fi
 # Creating etc directory for config files
 	if [ ! -d $ETC_CFG_DIR ];then
-		log "Creating $ETC_CFG_DIR direcory..."
+		log "Creating $ETC_CFG_DIR directory..."
 		mkdir -p $ETC_CFG_DIR
 		if [ $? -ne 0 ];then
 			log "Can't create $ETC_CFG_DIR, exiting!!!"
@@ -140,11 +140,9 @@ CLONE_FROM_GIT=$1
 	fi
 # making sample configs 
 	log "Making sample configuration files at \"$ETC_CFG_DIR\""
-	#for file in `ls $GIT_CLONE_DIR/$SERVICE_SRV_NAME/etc`
 	for file in `ls $SERVICE_CONTENT_DIRECTORY/etc`
 	do
-		#cp -f "$GIT_CLONE_DIR/$SERVICE_SRV_NAME/etc/$file" "$ETC_CFG_DIR/$file.sample"
-		cp -f "$SERVICE_CONTENT_DIRECTORY/etc/$file" "$ETC_CFG_DIR/$file.sample"
+	        cp -f "$SERVICE_CONTENT_DIRECTORY/etc/$file" "$ETC_CFG_DIR/$file"
 	done
 }
 
@@ -210,7 +208,7 @@ uninst()
 # postinstall
 postinst()
 {
-	log "Please, make proper configugation,located at \"$ETC_CFG_DIR\", before starting the \"$SERVICE_SRV_NAME\" daemon!"
+	log "Please, make proper configuration,located at \"$ETC_CFG_DIR\", before starting the \"$SERVICE_SRV_NAME\" daemon!"
 }
 # Command line args'
 COMMAND="$1"