diff --git a/Makefile.global b/Makefile.global
index 4d9f4f066..18090808e 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -13,9 +13,13 @@ Makefile: $(srcdir)/Makefile.in  $(abs_top_builddir)/config.status
 $(abs_top_builddir)/config.status: $(top_srcdir)/configure
 	( cd ${abs_top_builddir} && $(SHELL) ./config.status --recheck ) 
 
+$(abs_top_builddir)/config.h: $(abs_top_builddir)/stamp-h
+$(abs_top_builddir)/stamp-h: $(top_srcdir)config.h.in config.status
+	./config.status
+
 #$(top_srcdir)/configure: $(top_srcdir)/configure.in 
 #$(top_srcdir)/configure:
-#	( cd $(top_builddir) && $(AUTOCONF) )
+#	( cd $(top_srcdir) && $(AUTOCONF) )
 
 #extern modules
 
@@ -30,7 +34,7 @@ $(LINKLIBS): %.a: Makefile
 #dep rule
 
 $(addsuffix .d,$(ALLOBJ)): %.d: ${srcdir}/%.c Makefile
-	 @ $(CCDEP) ${DEPFLAGS} ${INCLUDES} ${DEFS} $< > $@ 
+	 @ $(CCDEP) ${DEPFLAGS} ${CPPFLAGS} ${INCLUDES} ${DEFS} $< > $@ 
 
 ${top_builddir}/fixed_volume.h: ${top_srcdir}/fixed_volume.h.in ${top_builddir}/config.status
 	cd ${abs_top_builddir} && CONFIG_FILES=fixed_volume.h CONFIG_HEADERS= $(SHELL) ${top_builddir}/config.status
diff --git a/Makefile.in b/Makefile.in
index 36cce689d..9ee0f145b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,27 +11,28 @@ CCDEP = @CCDEP@
 CFLAGS = @CFLAGS@ 
 LDFLAGS = @LDFLAGS@
 DEPFLAGS = @DEPFLAGS@
+CPPFLAGS = @CPPFLAGS@
 CCLD = $(CC)
 LEX = @LEX@ 
 AUTOCONF = @AUTOCONF@
 LIBS = @LIBS@ 
 SHELL = @SHELL@
 OPTARGS = @OPTARGS@
+SOPTARGS = @SOPTARGS@
 DEFS = @DEFS@
 
 INCLUDES = @INCLUDES@ 
 LINK = $(CCLD) -o $@ ${LDFLAGS} ${OPTARGS}
 LINKLIBS = ${top_builddir}/linalg/liblinalg.a  \
 	${top_builddir}/solver/libsolver.a
-COMPILE = ${CC} $(DEFS) $(INCLUDES) -o $@ ${CFLAGS} ${OPTARGS}
+COMPILE = ${CC} $(DEFS) $(INCLUDES) -o $@ ${CFLAGS}
 
 MODULES = init_gauge_field init_geometry_indices init_spinor_field \
 	init_bispinor_field init_moment_field init_gauge_tmp \
 	read_input gamma linsolve xchange_field xchange_gauge \
 	xchange_deri expo hybrid_update observables start \
-	geometry_eo linalg_eo ranlxd io Hopping_Matrix \
+	geometry_eo linalg_eo ranlxd io mpi_init update_tm \
 	boundary deriv_Sb tm_operators getopt sighandler \
-	mpi_init update_tm Hopping_Matrix_nocom \
 	test/check_geometry test/check_xchange invert_eo \
 	measure_rectangles get_rectangle_staples \
 	derivative_psf ext_integrator polyakov_loop \
@@ -39,6 +40,8 @@ MODULES = init_gauge_field init_geometry_indices init_spinor_field \
 	reweight_kappac init_dirac_halfspinor xchange_halffield \
 	source_generation
 
+SMODULES = Hopping_Matrix_nocom Hopping_Matrix
+
 ### eigenvalues_bi max_eigenvalues_bi Nondegenerate_Matrix \
 
 PROGRAMS = hmc_tm thermal_cycle_tm benchmark invert gwc2ildg ildg2gwc single2double double2single reducenoise gen_sources
@@ -61,13 +64,16 @@ flex_read_input: read_input.l
 	${LEX} -i -t $< > read_input.c
 
 ${addsuffix .o, ${MODULES}}: %.o: ${srcdir}/%.c %.d Makefile
-	${COMPILE} -c $< 
+	${COMPILE} ${OPTARGS} -c $< 
+
+${addsuffix .o, ${SMODULES}}: %.o: ${srcdir}/%.c %.d Makefile
+	${COMPILE} ${SOPTARGS} -c $< 
 
 ${addsuffix .o, ${PROGRAMS}}: %.o: ${srcdir}/%.c %.d Makefile
 	${COMPILE} -c $<
 
-${PROGRAMS}: %: %.o ${addsuffix .o, ${MODULES}} ${LINKLIBS}
-	 ${LINK} ${addsuffix .o, ${MODULES}} $@.o $(LIBS)
+${PROGRAMS}: %: %.o ${addsuffix .o, ${MODULES}} ${addsuffix .o, ${SMODULES}} ${LINKLIBS}
+	 ${LINK} ${addsuffix .o, ${MODULES}} ${addsuffix .o, ${SMODULES}} $@.o $(LIBS)
 
 dep: $(addsuffix .d,$(ALLOBJ))
 
diff --git a/config.guess b/config.guess
index d0d57f694..c08cebd35 100755
--- a/config.guess
+++ b/config.guess
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2005-09-19'
+timestamp='2006-11-30'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -106,7 +107,7 @@ set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -160,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -206,8 +208,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -764,7 +769,14 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -779,8 +791,11 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+    x86:Interix*:[3456]*)
+	echo i586-pc-interix${UNAME_RELEASE}
+	exit ;;
+    EM64T:Interix*:[3456]* | authenticamd:Interix*:[3456]*)
+	echo x86_64-unknown-interix${UNAME_RELEASE}
 	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -817,6 +832,9 @@ EOF
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
 	exit ;;
@@ -851,7 +869,11 @@ EOF
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
@@ -870,7 +892,11 @@ EOF
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
@@ -919,6 +945,9 @@ EOF
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
@@ -964,7 +993,7 @@ EOF
 	LIBC=gnulibc1
 	# endif
 	#else
-	#ifdef __INTEL_COMPILER
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -974,7 +1003,11 @@ EOF
 	LIBC=dietlibc
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
 	test x"${LIBC}" != x && {
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 		exit
@@ -1176,6 +1209,12 @@ EOF
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1263,6 +1302,9 @@ EOF
     i*86:skyos:*:*)
 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
 	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/config.sub b/config.sub
index 1c366dfde..90397981d 100755
--- a/config.sub
+++ b/config.sub
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2005-07-08'
+timestamp='2006-11-07'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -119,8 +120,9 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -171,6 +173,10 @@ case $os in
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -187,6 +193,10 @@ case $os in
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -231,7 +241,7 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
@@ -239,7 +249,8 @@ case $basic_machine in
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -257,28 +268,27 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| ms1 \
+	| mt \
 	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m32c)
-		basic_machine=$basic_machine-unknown
-		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -286,6 +296,9 @@ case $basic_machine in
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -305,7 +318,7 @@ case $basic_machine in
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
+	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
@@ -316,7 +329,7 @@ case $basic_machine in
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -336,31 +349,30 @@ case $basic_machine in
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
-	| ms1-* \
+	| mt-* \
 	| msp430-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
-	m32c-*)
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -696,6 +708,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -803,6 +818,12 @@ case $basic_machine in
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -859,6 +880,10 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -885,6 +910,10 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -896,6 +925,9 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -1101,7 +1133,7 @@ case $basic_machine in
 	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1174,21 +1206,23 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku*)
+	      | -skyos* | -haiku* | -rdos* | -toppers*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1318,6 +1352,9 @@ case $os in
 	-zvmoe)
 		os=-zvmoe
 		;;
+	-blrts)
+		os=-blrts
+		;;
 	-none)
 		;;
 	*)
@@ -1340,6 +1377,12 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+		os=-elf
+		;;
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1349,9 +1392,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
diff --git a/configure b/configure
index 0575fba3e..b0631331d 100755
--- a/configure
+++ b/configure
@@ -312,7 +312,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LEX LEXLIB LEX_OUTPUT_ROOT SET_MAKE RANLIB ac_ct_RANLIB CCDEP CPP EGREP MPICC LIBOBJS OPTARGS INCLUDES AUTOCONF SOLVEROUT DEPFLAGS DEBUG_FLAG PROFILE_FLAG F2C XCHANGELIB XCHANGEDIR XLIB LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LEX LEXLIB LEX_OUTPUT_ROOT SET_MAKE RANLIB ac_ct_RANLIB CCDEP CPP EGREP MPICC LIBOBJS OPTARGS SOPTARGS INCLUDES AUTOCONF SOLVEROUT DEPFLAGS DEBUG_FLAG PROFILE_FLAG F2C XCHANGELIB XCHANGEDIR XLIB LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1432,7 +1432,7 @@ program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
 rm conftest.sed
 
 
-if test "$host_cpu" = "powerpc" && test "$host_vendor" = "ibm"; then
+if test "$host_cpu" = "powerpc" && test "$host_vendor" = "ibm" && test "$host_os" != "blrts"; then
   echo We are on a IBM Power PC, using xlc and xlC or mpcc/mpCC
   CC=xlc_r
   CXX=xlC_r
@@ -6353,7 +6353,7 @@ if test $enable_mpi = yes; then
   if test "$host_vendor" != "cray"; then
     cross_compiling=yes
   fi
-  if test "$host_cpu" = "powerpc" && test "$host_vendor" = "ibm"; then
+  if test "$host_cpu" = "powerpc" && test "$host_vendor" = "ibm" && test "$host_os" != "blrts"; then
     CC=mpcc_r
     CXX=mpCC_r
   elif test "$host_cpu" = "i686" || test "$host_cpu" = "x86_64"; then
@@ -6409,7 +6409,7 @@ fi
 # AC_CONFIG_SUBDIRS( rng )
 
 # Checks for libraries.
-if test "$host_cpu" = "powerpc" && test "$host_vendor" = "ibm"; then
+if test "$host_cpu" = "powerpc" && test "$host_vendor" = "ibm" && test "$host_os" != "blrts"; then
   if test $with_lapack = yes; then
 
 echo "$as_me:$LINENO: checking for zaxpy in -lessl" >&5
@@ -6644,7 +6644,7 @@ fi
     echo "We should check for lapack here... (Is LD_LIBRARY_PATH set correctly?)!"
   fi
 
-elif test "$host_cpu" = "powerpc64" && test "$host_vendor" = "bgl" && test "$host_os" = "linux-gnu"; then
+elif test "$host_cpu" = "ppc64" && test "$host_vendor" = "ibm" && test "$host_os" != "blrts"; then
   if test $with_lapack = yes; then
     echo "$as_me:$LINENO: checking for zheev in -llapack" >&5
 echo $ECHO_N "checking for zheev in -llapack... $ECHO_C" >&6
@@ -8818,6 +8818,7 @@ done
 
 
 
+
 #AC_SUBST(ARPACK)
 #AC_SUBST(PARPACK)
 
@@ -9005,7 +9006,7 @@ if test "$host_cpu" = "i686" || test "$host_cpu" = "x86_64"; then
     fi
     CXXFLAGS=' -Wall'
     OPTARGS='-O'
-
+    SOPTARGS='-O'
 
     if test "$host_cpu" != "x86_64"; then
       if test $enable_p4 = yes && ((test $GCCVERSION1 -gt 2 && test $GCCVERSION2 -gt 1) || test $GCCVERSION1 -gt 3); then
@@ -9094,6 +9095,7 @@ _ACEOF
 	SSE="sse2"
       fi
       OPTARGS="-O2"
+      SOPTARGS="-O2"
       DEBUG_FLAG="-g"
       PROFILE_FLAG="-p -g"
       CCDEP="$CC"
@@ -9108,6 +9110,7 @@ _ACEOF
 	SSE="sse2"
       fi
       OPTARGS="-O3"
+      SOPTARGS="-O3"
       DEBUG_FLAG="-g"
       PROFILE_FLAG="-p -g"
       CCDEP="$CC"
@@ -9175,6 +9178,7 @@ _ACEOF
   fi
 
   OPTARGS="-O3"
+  SOPTARGS="-O3"
   if test "$CCDEP" = "gcc"; then
     DEPFLAGS="-MM"
   else
@@ -9182,7 +9186,7 @@ _ACEOF
   fi
 
 #The BLue Gene/L
-elif test "$host_cpu" = "powerpc64" && test "$host_vendor" = "bgl" && test "$host_os" = "linux-gnu"; then
+elif test "$host_cpu" = "powerpc" && test "$host_vendor" = "ibm" && test "$host_os" = "blrts"; then
   CFLAGS="$CFLAGS"
 
 cat >>confdefs.h <<\_ACEOF
@@ -9191,6 +9195,7 @@ _ACEOF
 
   DEBUGFLAG="-g"
   OPTARGS="-O3"
+  SOPTARGS="-O3"
 
 cat >>confdefs.h <<\_ACEOF
 #define BGL 1
@@ -9198,9 +9203,10 @@ _ACEOF
 
 
   if test "$GCC" != yes; then
-    CFLAGS="-qsrcmsg -qarch=440d -qtune=440 $CFLAGS"
+    CFLAGS="-qsrcmsg $CFLAGS"
+    OPTARGS="$OPTARGS -qarch=440 -qtune=440"
+    SOPTARGS="$SOPTARGS -qarch=440d -qtune=440"
     DEBUGFLAG="$DEBUGFLAG -qfullpath"
-    OPTARGS="-O3"
 # OPTARGS="-qhot" leads to wrong code
     XLC=yes
 
@@ -9220,9 +9226,9 @@ _ACEOF
   else
     DEPFLAGS="-M"
   fi
+  CPPFLAGS="-I/bgl/BlueLight/ppcfloor/bglsys/include"
   INCLUDES="$INCLUDES -I/bgl/BlueLight/ppcfloor/bglsys/include/"
 
-
 # The IBM Power PC
 elif test "$host_cpu" = "powerpc" && test "$host_vendor" = "ibm"; then
   CFLAGS="$CFLAGS -q64 -qsrcmsg"
@@ -9242,6 +9248,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
   OPTARGS="-O3 -qhot"
+  SOPTARGS="-O3 -qhot"
   DEBUG_FLAG="-qfullpath -g"
   if test "$CCDEP" = "gcc"; then
     DEPFLAGS="-MM"
@@ -9261,6 +9268,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
   OPTARGS="-O3"
+  SOPTARGS="-O3"
   DEBUG_FLAG="-g"
   CCDEP="$CC"
   DEPFLAGS="-M"
@@ -9310,6 +9318,8 @@ fi
   else
     DEPFLAGS="-M"
   fi
+  OPTARGS=
+  SOPTARGS=
 
   if test $with_lapack = yes; then
     LIBS="-llapack -lblas -lf $LIBS"
@@ -9330,6 +9340,7 @@ if test $enable_optimize = no; then
   echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
   OPTARGS=
+  SOPTARGS=
 else
   echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
@@ -10070,6 +10081,7 @@ s,@EGREP@,$EGREP,;t t
 s,@MPICC@,$MPICC,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@OPTARGS@,$OPTARGS,;t t
+s,@SOPTARGS@,$SOPTARGS,;t t
 s,@INCLUDES@,$INCLUDES,;t t
 s,@AUTOCONF@,$AUTOCONF,;t t
 s,@SOLVEROUT@,$SOLVEROUT,;t t
diff --git a/configure.in b/configure.in
index e6a33c2b4..d52fdbff9 100644
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ AC_CANONICAL_HOST()
 AC_PREFIX_DEFAULT($HOME)
 AC_ARG_PROGRAM
 
-if test "$host_cpu" = "powerpc" && test "$host_vendor" = "ibm"; then
+if test "$host_cpu" = "powerpc" && test "$host_vendor" = "ibm" && test "$host_os" != "blrts"; then
   echo We are on a IBM Power PC, using xlc and xlC or mpcc/mpCC
   CC=xlc_r
   CXX=xlC_r
@@ -134,7 +134,7 @@ if test $enable_mpi = yes; then
   if test "$host_vendor" != "cray"; then
     cross_compiling=yes
   fi
-  if test "$host_cpu" = "powerpc" && test "$host_vendor" = "ibm"; then
+  if test "$host_cpu" = "powerpc" && test "$host_vendor" = "ibm" && test "$host_os" != "blrts"; then
     CC=mpcc_r
     CXX=mpCC_r
   elif test "$host_cpu" = "i686" || test "$host_cpu" = "x86_64"; then	
@@ -150,7 +150,7 @@ fi
 # AC_CONFIG_SUBDIRS( rng )
 
 # Checks for libraries.
-if test "$host_cpu" = "powerpc" && test "$host_vendor" = "ibm"; then
+if test "$host_cpu" = "powerpc" && test "$host_vendor" = "ibm" && test "$host_os" != "blrts"; then
   if test $with_lapack = yes; then
     AC_CHECK_LIB(essl, zaxpy, ,AC_MSG_ERROR([libessl is missing or zaxpy not available]), -lf -lm )
     AC_CHECK_LIB(lapack, zheev, LP=yes;AC_DEFINE(HAVE_LAPACK,1,lapack available), LP="", -lessl -lblas -lf -lm )
@@ -166,7 +166,7 @@ elif test "$host_cpu" = "powerpc64" && test "$host_vendor" = "unknown" && test "
     echo "We should check for lapack here... (Is LD_LIBRARY_PATH set correctly?)!"
   fi
 
-elif test "$host_cpu" = "powerpc64" && test "$host_vendor" = "bgl" && test "$host_os" = "linux-gnu"; then
+elif test "$host_cpu" = "ppc64" && test "$host_vendor" = "ibm" && test "$host_os" != "blrts"; then
   if test $with_lapack = yes; then
     AC_CHECK_LIB(lapack, zheev, LP=yes, LP="", -lblas -lf77blas -latlas -lxlf90 -lxlfmath -lm)
     echo "We should check for lapack here... (Is LD_LIBRARY_PATH set correctly?)!"
@@ -218,6 +218,7 @@ AC_CHECK_FUNCS([gettimeofday pow sqrt])
 
 # We now define some replace variables
 AC_SUBST(OPTARGS)
+AC_SUBST(SOPTARGS)
 AC_SUBST(INCLUDES)
 AC_SUBST(AUTOCONF)
 AC_SUBST(SOLVEROUT)
@@ -349,7 +350,7 @@ if test "$host_cpu" = "i686" || test "$host_cpu" = "x86_64"; then
     fi
     CXXFLAGS=' -Wall'
     OPTARGS='-O'
-
+    SOPTARGS='-O'
 
     if test "$host_cpu" != "x86_64"; then
       if test $enable_p4 = yes && ((test $GCCVERSION1 -gt 2 && test $GCCVERSION2 -gt 1) || test $GCCVERSION1 -gt 3); then
@@ -422,6 +423,7 @@ if test "$host_cpu" = "i686" || test "$host_cpu" = "x86_64"; then
 	SSE="sse2"
       fi
       OPTARGS="-O2"
+      SOPTARGS="-O2"
       DEBUG_FLAG="-g"
       PROFILE_FLAG="-p -g"
       CCDEP="$CC"
@@ -436,6 +438,7 @@ if test "$host_cpu" = "i686" || test "$host_cpu" = "x86_64"; then
 	SSE="sse2"
       fi
       OPTARGS="-O3"
+      SOPTARGS="-O3"
       DEBUG_FLAG="-g"
       PROFILE_FLAG="-p -g"
       CCDEP="$CC"
@@ -491,6 +494,7 @@ elif test "$host_cpu" = "powerpc64" && test "$host_vendor" = "unknown" && test "
   fi
 
   OPTARGS="-O3"
+  SOPTARGS="-O3"
   if test "$CCDEP" = "gcc"; then
     DEPFLAGS="-MM"
   else
@@ -498,17 +502,19 @@ elif test "$host_cpu" = "powerpc64" && test "$host_vendor" = "unknown" && test "
   fi
 
 #The BLue Gene/L
-elif test "$host_cpu" = "powerpc64" && test "$host_vendor" = "bgl" && test "$host_os" = "linux-gnu"; then
+elif test "$host_cpu" = "powerpc" && test "$host_vendor" = "ibm" && test "$host_os" = "blrts"; then
   CFLAGS="$CFLAGS"
   AC_DEFINE(NOF77_,1,Fortran has not extra _)
   DEBUGFLAG="-g"
   OPTARGS="-O3"
+  SOPTARGS="-O3"
   AC_DEFINE(BGL,1,[Optimize for Blue Gene/L])
 
   if test "$GCC" != yes; then
-    CFLAGS="-qsrcmsg -qarch=440d -qtune=440 $CFLAGS"
+    CFLAGS="-qsrcmsg $CFLAGS"
+    OPTARGS="$OPTARGS -qarch=440 -qtune=440"
+    SOPTARGS="$SOPTARGS -qarch=440d -qtune=440"
     DEBUGFLAG="$DEBUGFLAG -qfullpath"
-    OPTARGS="-O3"
 # OPTARGS="-qhot" leads to wrong code
     XLC=yes
     AC_DEFINE(XLC,1,Are we using the IBM xlc compiler?)
@@ -524,9 +530,9 @@ elif test "$host_cpu" = "powerpc64" && test "$host_vendor" = "bgl" && test "$hos
   else
     DEPFLAGS="-M"
   fi
+  CPPFLAGS="-I/bgl/BlueLight/ppcfloor/bglsys/include"
   INCLUDES="$INCLUDES -I/bgl/BlueLight/ppcfloor/bglsys/include/"
 
-
 # The IBM Power PC
 elif test "$host_cpu" = "powerpc" && test "$host_vendor" = "ibm"; then
   CFLAGS="$CFLAGS -q64 -qsrcmsg"
@@ -538,6 +544,7 @@ elif test "$host_cpu" = "powerpc" && test "$host_vendor" = "ibm"; then
   XLC=yes
   AC_DEFINE(XLC,1,Are we using the IBM xlc compiler?)
   OPTARGS="-O3 -qhot"
+  SOPTARGS="-O3 -qhot"
   DEBUG_FLAG="-qfullpath -g"
   if test "$CCDEP" = "gcc"; then
     DEPFLAGS="-MM"
@@ -553,6 +560,7 @@ elif test "$host_vendor" = "cray"; then
   CFLAGS="$CFLAGS -dp"
   AC_DEFINE(CRAY,1,We are on a CRAY)
   OPTARGS="-O3"
+  SOPTARGS="-O3"
   DEBUG_FLAG="-g"
   CCDEP="$CC"
   DEPFLAGS="-M"
@@ -567,6 +575,8 @@ else
   else
     DEPFLAGS="-M"
   fi
+  OPTARGS=
+  SOPTARGS=
 
   if test $with_lapack = yes; then
     LIBS="-llapack -lblas -lf $LIBS"
@@ -581,6 +591,7 @@ AC_ARG_ENABLE(optimize,
 if test $enable_optimize = no; then
   AC_MSG_RESULT(no)
   OPTARGS=
+  SOPTARGS=
 else
   AC_MSG_RESULT(yes)
 fi
diff --git a/linalg/Makefile.in b/linalg/Makefile.in
index 01a3eedcb..d0213e3ce 100644
--- a/linalg/Makefile.in
+++ b/linalg/Makefile.in
@@ -12,6 +12,7 @@ DEPFLAGS = @DEPFLAGS@
 LDFLAGS = @LDFLAGS@
 DEFS = @DEFS@
 OPTARGS = @OPTARGS@
+SOPTARGS = @SOPTARGS@
 
 AR = ar
 RANLIB = @RANLIB@
@@ -26,13 +27,13 @@ DEFS = @DEFS@
 INCLUDES = @INCLUDES@
 LDADD =
 #COMPILE = ${CC} ${DEFS} $(INCLUDES) ${CFLAGS}
-COMPILE = ${CC} $(DEFS) $(INCLUDES) ${CFLAGS} ${OPTARGS}
+COMPILE = ${CC} $(DEFS) $(INCLUDES) ${CFLAGS}
 
 LIBRARIES = liblinalg
-liblinalg_TARGETS = diff assign_add_mul_r_add_mul assign_add_mul_r \
-	square_norm assign_mul_bra_add_mul_ket_add_r scalar_prod_r \
+liblinalg_TARGETS = assign_add_mul_r_add_mul \
+	assign_mul_bra_add_mul_ket_add_r scalar_prod_r \
 	square_and_prod_r assign_mul_bra_add_mul_r mul_r \
-	diff_and_square_norm assign deri_linalg assign_mul_add_r \
+	diff_and_square_norm assign deri_linalg \
 	scalar_prod mul_diff_r mul_diff_mul assign_add_mul add \
 	assign_diff_mul mul_add_mul mul assign_add_mul_add_mul \
 	assign_mul_bra_add_mul_ket_add assign_mul_add_mul_add_mul_add_mul_r \
@@ -42,7 +43,10 @@ liblinalg_TARGETS = diff assign_add_mul_r_add_mul assign_add_mul_r \
         assign_mul_bra_add_mul_ket_add_bi mul_r_bi \
         scalar_prod_r_bi assign_add_mul_r_bi assign_mul_add_r_bi 
 
+liblinalg_STARGETS = diff assign_add_mul_r assign_mul_add_r square_norm
+
 liblinalg_OBJECTS = $(addsuffix .o, ${liblinalg_TARGETS})
+liblinalg_SOBJECTS = $(addsuffix .o, ${liblinalg_STARGETS})
 
 # default rule
 
@@ -65,30 +69,33 @@ include ${top_srcdir}/Makefile.global
 
 # rule to compile objects
 
-%.o: ${srcdir}/%.c %.d Makefile
-	$(COMPILE) -c $<
+${liblinalg_OBJECTS}: %.o: ${srcdir}/%.c %.d Makefile
+	$(COMPILE) ${OPTARGS} -c $<
+
+${liblinalg_SOBJECTS}: %.o: ${srcdir}/%.c %.d Makefile
+	$(COMPILE) ${SOPTARGS} -c $<
 
 # rule to make liblinalg
 
-liblinalg.a: ${liblinalg_OBJECTS} Makefile
+liblinalg.a: ${liblinalg_OBJECTS} ${liblinalg_SOBJECTS} Makefile
 	@rm -f liblinalg.a
-	@${AR} cru liblinalg.a $(liblinalg_OBJECTS)
+	@${AR} cru liblinalg.a $(liblinalg_OBJECTS) $(liblinalg_SOBJECTS)
 	@$(RANLIB) liblinalg.a
 	@cp liblinalg.a ../lib/liblinalg.a
 
 # rule to generate .d files
 
-$(addsuffix .d,$(liblinalg_TARGETS)): %.d: ${srcdir}/%.c Makefile
+$(addsuffix .d, $(liblinalg_TARGETS) ${liblinalg_STARGETS}): %.d: ${srcdir}/%.c Makefile
 	@$(CCDEP) ${DEPFLAGS} ${INCLUDES} $< > $@
 
 # rule to make dependencies
 
-dep: ${addsuffix .d, ${liblinalg_TARGETS}}
+dep: ${addsuffix .d, ${liblinalg_TARGETS} ${liblinalg_STARGETS}}
 
 # rules to clean
 
 compile-clean: Makefile
-	rm -f ${$(addsuffix _OBJECTS, ${LIBRARIES})} *.d
+	rm -f ${$(addsuffix _OBJECTS, ${LIBRARIES})} ${$(addsuffix _SOBJECTS, ${LIBRARIES})} *.d
 
 clean: compile-clean 
 	rm -f $(addsuffix .a, ${LIBRARIES})
diff --git a/reducenoise.c b/reducenoise.c
index 7342d46d5..404e54f0c 100644
--- a/reducenoise.c
+++ b/reducenoise.c
@@ -195,18 +195,18 @@ int main(int argc,char *argv[]) {
   }
 
   if(source_format_flag == 0) {
-      sprintf(conf_filename,"%s", source_input_filename); 
-      if(g_proc_id == 0) {
-	  printf("Reading source from %s\n", conf_filename);
-      }
-      read_spinorfield_eo_time(g_spinor_field[0], g_spinor_field[1], conf_filename); 
+    sprintf(conf_filename,"%s", source_input_filename); 
+    if(g_proc_id == 0) {
+      printf("Reading source from %s\n", conf_filename);
+    }
+    read_spinorfield_eo_time(g_spinor_field[0], g_spinor_field[1], conf_filename); 
   }
   else if(source_format_flag == 1) {
-      sprintf(conf_filename,"%s", source_input_filename);
-      if(g_proc_id == 0) {
-	  printf("Reading source from %s\n", conf_filename);
-      }
-      read_spinorfield_cm_single(g_spinor_field[0], g_spinor_field[1], conf_filename, -1, 1);
+    sprintf(conf_filename,"%s", source_input_filename);
+    if(g_proc_id == 0) {
+      printf("Reading source from %s\n", conf_filename);
+    }
+    read_spinorfield_cm_single(g_spinor_field[0], g_spinor_field[1], conf_filename, -1, 1);
   }
   if(g_proc_id == 0) {printf("mu = %e\n", g_mu);}
   
diff --git a/test/check_geometry.c b/test/check_geometry.c
index dc0fc53a3..4c157270e 100644
--- a/test/check_geometry.c
+++ b/test/check_geometry.c
@@ -28,6 +28,9 @@
 
 int check_geometry()
 {
+#ifdef XLC
+#pragma execution_frequency(very_low)
+#endif
   int ix, j;
   int * stest;
   int * itest;
diff --git a/test/check_xchange.c b/test/check_xchange.c
index ff9530481..70e997b59 100644
--- a/test/check_xchange.c
+++ b/test/check_xchange.c
@@ -29,6 +29,10 @@ int check_geometry();
 
 int check_xchange()
 {
+#ifdef XLC
+#pragma execution_frequency(very_low)
+#endif
+
 #ifdef MPI
   double * x;
   int i,ix, mu, x0, x1, x2, x3, k;