diff --git a/VERSION b/VERSION
index 7824e432..6228bf55 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.0-0-dev
+1.0.0-2-dev
diff --git a/make/defs-orig.mk b/make/defs-orig.mk
index 548a2a17..510b1430 100644
--- a/make/defs-orig.mk
+++ b/make/defs-orig.mk
@@ -17,9 +17,9 @@ ifndef PROJECT
 			lock sigsync shmem \
 			usrv uclnt statecheck msgfmt \
 			YMisc YError \
-			YThread YMutex YEvent YCbContr \
+			YThread YMutex YEvent YCbContr contr/Y2WayMap \
 			YTimeB YStopWatch YStopWatchList YStopWatchQueue YStopWatchThreadList \
-			lib include
+			lib include bin
 endif
 
 LIBNAME := $(PROJECT)
@@ -134,15 +134,16 @@ MEMBERS     = $(LIB_A)($(OBJ))
 #YAMD        = yamd-
 #EFENCE      = -lefence
 #CFLAGS    += -DNDEBUG -O2 -g $(INCLUDE) $(LOCAL_CFLAGS) #production
-CFLAGS_DEBUG = -Wall -D_DEBUG_ -g3 $(MEMWATCH) 
-CFLAGS      += $(INCLUDE) $(PROJECT_CFLAGS)   $(CFLAGS_DEBUG)   $(LOCAL_CFLAGS)   $(YLIB_CFLAGS)
-CPPFLAGS    += $(INCLUDE) $(PROJECT_CPPFLAGS) $(CPPFLAGS_DEBUG) $(LOCAL_CPPFLAGS) $(YLIB_CPPFLAGS)
+CFLAGS_DEBUG   = -Wall -D_DEBUG_ -g3 $(MEMWATCH) 
+CPPFLAGS_DEBUG = $(CFLAGS_DEBUG)
+CFLAGS      += $(INCLUDE) $(PROJECT_CFLAGS)   $(LOCAL_CFLAGS)   $(YLIB_CFLAGS)
+CPPFLAGS    += $(INCLUDE) $(PROJECT_CPPFLAGS)  $(LOCAL_CPPFLAGS) $(YLIB_CPPFLAGS)
 LDFFTW    = -lrfftw -lfftw -lm
 #LDAUDIO   = -laudiofile
 
 ifeq ($(DEVELOPMENT),true)
 CFLAGS += $(CFLAGS_DEBUG)
-CPPFLAGS += $(CFLAGS_DEBUG)
+CPPFLAGS += $(CPPFLAGS_DEBUG)
 endif
 
 LIBDIR      = $(TOPDIR)/lib
diff --git a/make/dirs.mk b/make/dirs.mk
index 2febab51..5d7bc654 100644
--- a/make/dirs.mk
+++ b/make/dirs.mk
@@ -16,7 +16,7 @@ subdirs:
 	$(make_subdirs)
 
 clean distclean:
-	rm -rf $(TEXTCLEAN) $(CLEAN)
+	rm -rf $(TEXTCLEAN) $(CLEAN) dist *.done *~ .*.swp *.tmp core *.rep
 	$(make_subdirs_target)
 
 .DEFAULT:
diff --git a/make/mkspec.sh b/make/mkspec.sh
index 2646e9bc..15242b1c 100644
--- a/make/mkspec.sh
+++ b/make/mkspec.sh
@@ -111,11 +111,12 @@ echo "%install"
 #echo 'pwd'
 echo "export ENV_PREFIX=\$RPM_BUILD_ROOT"
 echo "export INSTALL_LOG=$INSTALL_LOG"
+echo "rm -rf `dirname $INSTALL_LOG`"
 echo "mkdir -p `dirname $INSTALL_LOG`"
 echo "> $INSTALL_LOG"
 echo "make install"
-echo "cat $INSTALL_LOG | sed \"s% \$RPM_BUILD_ROOT% %\" | grep -ve 'include\|devel\|make\|lib.*\.a$' > $INSTALL_LOG.$NAME"
-echo "cat $INSTALL_LOG | sed \"s% \$RPM_BUILD_ROOT% %\" | grep -e  'include\|devel\|make\|lib.*\.a$' > $INSTALL_LOG.$NAME-devel"
+echo "cat $INSTALL_LOG | sed \"s% \$RPM_BUILD_ROOT% %\" | grep -ve 'include\|devel\|make\|lib.*\.a$\|lib.*\.so$' > $INSTALL_LOG-run"
+echo "cat $INSTALL_LOG | sed \"s% \$RPM_BUILD_ROOT% %\" | grep -e  'include\|devel\|make\|lib.*\.a$\|lib.*\.so$' > $INSTALL_LOG-devel"
 #echo "install -m  755 $TOPDIR/lib/*.so            \$RPM_BUILD_ROOT/opt/ytools/lib"
 #echo "install -m  644 $TOPDIR/doc/ytools/dist/*   \$RPM_BUILD_ROOT/usr/share/doc/packages/ytools"
 #echo "install -m  644 $TOPDIR/COPYING             \$RPM_BUILD_ROOT/usr/share/doc/packages/ytools"
@@ -124,9 +125,9 @@ echo ""
 #echo "%post /sbin/ldconfig"
 echo ""
 echo "%clean"
-echo 'rm -rf $RPM_BUILD_ROOT'
-echo "%files -n $NAME-run -f $INSTALL_LOG.$NAME"
-echo "%files -n $NAME-devel -f $INSTALL_LOG.$NAME-devel"
+#echo 'rm -rf $RPM_BUILD_ROOT'
+echo "%files -n $NAME-run -f $INSTALL_LOG-run"
+echo "%files -n $NAME-devel -f $INSTALL_LOG-devel"
 echo '%defattr (-, root, root)'
 #echo "%dir /opt/ytools/lib"
 #echo "/opt/ytools/lib"
diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index 432e4b5b..340ad415 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -73,10 +73,10 @@ cpfiles.dist:
 	cp $(SRPMS_DIR)/$(notdir $@) $@
 
 $(DIST_PCKG_DIR)/$(PCKG_RPM_RUN_I386) $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386): $(DIST_PCKG_DIR)/$(PCKG_TAR)
-	if [ $< -nt $(RPMS_DIR)/$(notdir $@) ]; then rpm -tb --clean $<; fi
+	if [ $< -nt $(RPMS_DIR)/$(notdir $@) ]; then rpm -tb $<; fi
 	cp $(RPMS_DIR)/$(notdir $@) $@
 
-$(DIST_PCKG_DIR)/CURRENT_%:
+$(DIST_PCKG_DIR)/CURRENT_%: $(TOPDIR)/VERSION
 	echo $(CURRENT_$*) > $@
 
 
diff --git a/make/rules.mk b/make/rules.mk
index 9102b753..fe7cec16 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -27,14 +27,11 @@ $(LIBDIR):
 moc_%.cpp: %.h
 	$(MOC) -o $@ $<
 
-#ifeq ($(LIBTYPE),shared)
-#lib%.so: %.o $(LIB_SO)
-#else
-#lib%.so: %.o
-#endif
-#	$(CC) $< $(LDFLAGS) -o $@
-
+ifeq ($(LIBTYPE),shared)
+lib%.so: %.o $(LIB_SO)
+else
 lib%.so: %.o
+endif
 	$(CC) $< $(LDFLAGS) -o $@
 
 $(LIB_SO): $(LIB_A)
@@ -47,7 +44,7 @@ $(TOPDIR)/include/%.h: %.h
 	mkdir -p $(dir $@); cp $(@F) $@
 
 $(TOPDIR)/bin/%.sh: %.sh
-	mkdir -p $(dir $@); cp $(@F) $@
+	mkdir -p $(dir $@); install -m 755 $(@F) $@
 
 %.o: %.cpp
 	$(CPP) $(CPPFLAGS) -c $<
@@ -73,7 +70,7 @@ $(LIBS):
 	make -C $(LIBDIR) all
 
 $(INSTALL_HDRDIR) $(INSTALL_BINDIR) $(INSTALL_LIBDIR) $(INSTALL_MKDIR):
-	mkdir -p $@
+	$(INSTALL) -d -g $(EXEGROUP) -o $(EXEOWNER) -m $(EXEMODE) $@
 
 $(INSTALLED_LIB_SO) $(INSTALLED_LIB_A): libdir.done