diff --git a/src/Makefile.include b/src/Makefile.include
index adeff7796..13f4d7375 100644
--- a/src/Makefile.include
+++ b/src/Makefile.include
@@ -27,6 +27,12 @@ LIBS    = -L$(PUBLISH_DIR)
 
 ARCHITECTURE = Linux
 
+##
+## Default-Strings
+##
+MSG_COMPILE = "***** Compiling $@ *****"
+MSG_SUBDIR  = "===== Making $@ in $$subdir ====="
+
 ##
 ## user-defined makefiles
 ##
@@ -132,9 +138,10 @@ subdirs-debug subdirs-release subdirs-profile subdirs-dmalloc clean depend::
 	@if [ -n "$(SUBDIRS)" ]; then \
 	for subdir in x-placeholder-dir $(SUBDIRS); do \
 	if [ -d $$subdir ]; then \
-	echo --\> Making $@ in $$subdir ; \
+	echo $(MSG_SUBDIR) ; \
 	mkdir -p $$subdir/$(BUILD_DIR) ; \
 	$(MAKE) -C $$subdir -$(MAKEFLAGS) recurse-$@ || exit 1; \
+	echo; \
 	fi \
 	done \
 	fi
@@ -155,7 +162,7 @@ $(BUILD_DIR) $(PUBLISH_DIR):
 # object files:
 $(BUILD_DIR)/%:: $(BUILD_DIR)
 $(BUILD_DIR)/%.o:: %.c
-	@echo "***** Compiling $@ *****"
+	@echo $(MSG_COMPILE)
 	$(CC) $(CFLAGS) -o $@ -c $<
 	@echo
 
diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c
index 9ed1e0355..a10fc2f14 100644
--- a/src/common/gamecode/report.c
+++ b/src/common/gamecode/report.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: report.c,v 1.12 2001/02/10 10:40:10 enno Exp $
+ *	$Id: report.c,v 1.13 2001/02/10 13:20:33 corwin Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
@@ -3079,7 +3079,7 @@ writemonument(void)
 }
 
 static void
-writeadresses()
+writeadresses(void)
 {
 	faction *f;
 	FILE * F;
diff --git a/src/common/modules/oceannames.c b/src/common/modules/oceannames.c
index 9611348cd..0ed634653 100644
--- a/src/common/modules/oceannames.c
+++ b/src/common/modules/oceannames.c
@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: oceannames.c,v 1.2 2001/02/03 13:45:33 enno Exp $
+ * $Id: oceannames.c,v 1.3 2001/02/10 13:20:33 corwin Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
@@ -86,7 +86,7 @@ nameocean(struct region *r, struct faction * f, const char * newname)
 		faction_list **oldf = NULL, **newf = NULL;
 		faction_list * fl = NULL;
 		name * names = (name*)a->data.v;
-		while (names && (!newf && newname) || !oldf) {
+		while ((names && (!newf && newname)) || !oldf) {
 			faction_list ** fli = &names->factions;
 			if (oldf==NULL) while (*fli) {
 				if ((*fli)->f==f) {
diff --git a/src/corwin.mk b/src/corwin.mk
index d88058572..ee2f43ff9 100644
--- a/src/corwin.mk
+++ b/src/corwin.mk
@@ -13,3 +13,37 @@ INSTALL = cp
 
 # CFLAGS += -Wshadow
 
+#		 Ps = 0  -> Normal (default)
+#		 Ps = 1  -> Bold
+#		 Ps = 4  -> Underlined
+#		 Ps = 5  -> Blink (appears as Bold)
+#		 Ps = 7  -> Inverse
+#		 Ps = 8  -> Invisible (hidden)
+#		 Ps = 2 2  -> Normal (neither bold nor faint)
+#		 Ps = 2 4  -> Not underlined
+#		 Ps = 2 5  -> Steady (not blinking)
+#		 Ps = 2 7  -> Positive (not inverse)
+#		 Ps = 2 8  -> Visible (not hidden)
+#		 Ps = 3 0  -> Set foreground color to Black
+#		 Ps = 3 1  -> Set foreground color to Red
+#		 Ps = 3 2  -> Set foreground color to Green
+#		 Ps = 3 3  -> Set foreground color to Yellow
+#		 Ps = 3 4  -> Set foreground color to Blue
+#		 Ps = 3 5  -> Set foreground color to Magenta
+#		 Ps = 3 6  -> Set foreground color to Cyan
+#		 Ps = 3 7  -> Set foreground color to White
+#		 Ps = 3 9  -> Set foreground color to default (original)
+#		 Ps = 4 0  -> Set background color to Black
+#		 Ps = 4 1  -> Set background color to Red
+#		 Ps = 4 2  -> Set background color to Green
+#		 Ps = 4 3  -> Set background color to Yellow
+#		 Ps = 4 4  -> Set background color to Blue
+#		 Ps = 4 5  -> Set background color to Magenta
+#		 Ps = 4 6  -> Set background color to Cyan
+#		 Ps = 4 7  -> Set background color to White
+#		 Ps = 4 9  -> Set background color to default (original).
+
+MSG_COMPILE = "\#\#\#\#\# Compiling $@ \#\#\#\#\#"
+MSG_SUBDIR  = "\#\#\#\#\# Making $@ in $$subdir \#\#\#\#\#"
+
+