diff --git a/ChangeLog b/ChangeLog
index a2e7fd5..fb94d61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,10 @@
-tbaMUD is currently being developed by The Builder Academy. If you need any
+atbaMUD is currently being developed by The Builder Academy. If you need any
 help or find any bugs please stop by: builderacademy.net 9091
 
-todo:
-- Change numerous SYSERR logs to Warnings.
-- Change all doc/pdf's to .txt.
-
+tbaMUD 3.51
+- Added years to messages (thanks Rhade).
+- Updated version and files to new name: tbaMUD!
+- Renamed medit_alias and oedit_namelist to _keyword for consistency.
 - Moved numerous protos only used once from .h files to appropriate .c file.
 - Renamed numerous functions for clarity (mostly shop functions like copy_list
   to copy_shop_list, etc).
@@ -25,7 +25,7 @@ todo:
   The load function has been kept for backwards compatibility.
 - Moved alias saving to Ascii pflies by default. Aliases in the old files will 
   still be read (once per char).
-- do_toggle actually toggles everything now (thanks to Rhade). Moved slowns, 
+- do_toggle actually toggles everything now (thanks Rhade). Moved slowns, 
   track, syslog, pagelength, wimpy, and color to toggle <option> <arg>. Keeping
   do_gen_tog so the old command toggles still work.
 - Immortals no longer have to pay to mudmail.
@@ -34,7 +34,7 @@ todo:
 - Removed unused olc_bitvector and save_etext functions.
 - Added min_level check to hindex.
 - Fixed zlist and index files 
-- Changed PRF_ROOMFLAGS to PRF_SHOWVNUMS.
+- Renamed roomflags to showvnums.
 - Mini world zone 0, 12, 30 error free (Added 1.trg to index.mini for examples)
 - Updated errors for no time/config files.
 - Added -l(eader) and -g(rouped) options to do_who (thanks Rhade).
@@ -42,7 +42,6 @@ todo:
 - Spellchecked stock.hlp.
 - Updated fixes from 3.1 CVS snapshot.
 - Fixed permissions on numerous files.
-- Moved do_cheat into do_return.
 - Renamed shit, no really in zmalloc.c unsigned char * shit;
 - Spellchecked help.hlp.
 - Updated /doc/README.Cygwin.
@@ -51,7 +50,7 @@ todo:
 - Modified all comments referring to old playerfile and removed obsolete code.
 - Removed .accepted, conf.h, and Makefile. 
 - Moved text/hedit to text/help directory. Now 2 help files to choose from 
-  help.hlp (TBA's helpfiles) and stock.hlp.
+  help.hlp (TBA's helpfiles) and the oldhelp directory.
 - Fixed error from adding poofs to do_stat and not checking !IS_NPC.
 - Fixed help search so it checks player level so HELP AC can exist as a mortal
   helpfile and an immortal helpfile.
@@ -221,7 +220,7 @@ CircleMUD 3.5
 - Added history command to show last 100 comms.
 - Added an export command that would QQ and compress a zone.
 - Numerous new logs for force, buildwalk, delete, snoop, etc.
-- Added vnum and TRIG tags to everything, roomflags toggles it on/off.
+- Added vnum and TRIG tags to everything, showvnums toggles it on/off.
 - Added keyword seperation when statting extra desc. [desk] [notes papers]
 - Added buildwalk and dig.
 
@@ -256,4 +255,4 @@ Version 2.11 release: September 19, 1993
 Version 2.10 release: September 1, 1993
 Version 2.02 release: Late August 1993
 Version 2.01 release: Early August 1993
-Version 2.00 release: July 16, 1993 (Initial public release)
\ No newline at end of file
+Version 2.00 release: July 16, 1993 (Initial public release)
diff --git a/README b/README
index 27e27d5..e1deaf8 100644
--- a/README
+++ b/README
@@ -1,36 +1,33 @@
-                           CircleMUD README File
+                            tbaMUD README File
                            ---------------------
-Updated: Dec 2006
+Updated: Jan 2006
 
-Welcome to CircleMUD 3.5!  I hope you enjoy your stay.
-
-Current development of CircleMUD is being done by the Builder Academy. All
-requests for help or bugs should be reported there: builderacademy.net 9091.
+All requests for help or bugs should be reported there: builderacademy.net 9091.
 
 Information about CircleMUD can be found at the CircleMUD Home Page and FTP:
 http://www.circlemud.org
 ftp://ftp.circlemud.org
 
-Both of these sights are outdated and no longer maintained. Hopefully this will
-change soon. Until then the latest information and downloads can be found at 
-the CWG forums and download section: 
-
+Both of these sites are outdated and no longer maintained. The latest 
+information and downloads can be found at the CWG forums and download
+section: 
 http://cwg.lazuras.org/modules.php?name=Forums
 
 
-Downloading CircleMUD
+Downloading tbaMUD
 ---------------------
 
-You can find the current version of CircleMUD at the following URL:
+You can find the current version of tbaMUD at the following URL:
 
 http://cwg.lazuras.org/modules.php?name=Downloads
 
 
-Compiling CircleMUD
+Compiling
 -------------------
 
-CircleMUD compiles under a large number of operating systems; instructions
+tbaMUD compiles under a large number of operating systems; instructions
 for compiling on each platform is can be found in the file doc/README.<system>
+Many of these instructions are outdated, please feel free to update them.
 
 AMIGA   - If you are using an Amiga running AmigaDOS. (If you're running 
           NetBSD or Linux on an Amiga, use README.UNIX instead.)
@@ -54,7 +51,6 @@ WATCOM  - If using WATCOM under Windows.
 
 WIN     - If you are using Windows.
 
-
 If you are interested in porting CircleMUD to a new platform, see the
 file doc/porting.txt for some tips.
 
@@ -94,10 +90,9 @@ the more basic coding tasks such as how to add new commands, spells,
 skills, socials, and classes.  Note that it assumes the reader already has
 an excellent knowledge of C; the manual is not a C tutorial.
 
-"The CircleMUD SYSERR List" (syserr.txt, syserr.ps)
-    A list of SYSERR messages CircleMUD can generate, and a description of what
-can cause each problem and how to solve it.  An excellent guide for 
-troubleshooting and area debugging.
+"The CircleMUD SYSERR List" (syserr.txt)
+    A list of SYSERR messages and a description of what can cause each problem
+and how to solve it.  An excellent guide for troubleshooting and area debugging.
 
 
 Getting Help
@@ -113,8 +108,7 @@ http://post.queensu.ca/cgi-bin/listserv/wa?SUBED1=circle&A=1
 No matter how you choose to get help, make sure to always include the
 following information:
 
-  -- The exact version of CircleMUD you're using (e.g., "CircleMUD 3.5",
-     "CircleMUD 3.0 beta patchlevel 21", etc.).
+  -- The exact version you are using (i.e., "tbaMUD 3.51", etc.).
   -- The EXACT text of any error messages, compiler errors, link errors, or any
      other errors you're getting.
   -- The exact type of hardware, operating system name and version, and
diff --git a/lib/text/greetings b/lib/text/greetings
index cdec6c3..dc43465 100644
--- a/lib/text/greetings
+++ b/lib/text/greetings
@@ -1,7 +1,7 @@
                               Your MUD Name Here
                               lib/text/greetings
 
-                            Based on CircleMUD 3.5,
+                              Based on CircleMUD,
                             Created by Jeremy Elson
 
                       A derivative of DikuMUD (GAMMA 0.0),
diff --git a/lib/text/help/help.hlp b/lib/text/help/help.hlp
index 38d7ff4..2d15d5f 100644
--- a/lib/text/help/help.hlp
+++ b/lib/text/help/help.hlp
@@ -124,10 +124,10 @@ See also: AEDIT, SOCIALS
 #31
 VNUMS FIND-ITEM VNUM-OBJ VNUM-MOBILES  
 
-Usage: vnum { room | obj | mob | trig } <name>
+Usage: vnum { room | obj | mob | trig } <keyword>
 
    Returns a list of the virtual numbers of the room, object, mobile, or trig
-which have the specified namelist or alias.
+which have the specified keyword.
 
 Examples:
 
@@ -155,7 +155,7 @@ HIDDEN-DOORS . HIDDEN-EXITS HIDDEN-ROOMS HIDDEN-OBJECTS HIDDEN-MOBS SECRETS UNSE
 present and may be acted upon by players. 
    This is done by starting the l-desc with a period (.). Unless a player has 
 holylight on they will not be able to see it. To make things easier please 
-please include the namelist "hidden" on the object or mobile.
+please include the keyword "hidden" on the object or mobile.
 
 .This is a hidden object/mob. This long description can only be seen with holylight.
 This normal description can be seen by anyone.
@@ -248,10 +248,10 @@ any of the above mudmail your coder after your zone is complete.
    Most of the things possible through special procedures can now be done
 through trigedit. 
 
-To create a postmaster make a mob, set one of the alias' as "postmaster," set
+To create a postmaster make a mob, set one of the keywords as "postmaster," set
 the NPC flag SPEC, and load it to the room via zedit. 
 
-To create a bank make an object, set it to type OTHER, add namelist "bank" and
+To create a bank make an object, set it to type OTHER, add keyword "bank" and
 load it to the room via zedit. 
 
 In all cases special procedures need to be added in by a coder. Once your zone
@@ -619,7 +619,7 @@ FAQ FREQUENTLY-ASKED-QUESTIONS
 
 1. Can I add color to my area? 
    Yes, you can. Just type in all the color codes. Just remember not to color
-mob alias or obj amelist. @RHELP COLOR-CODES@n.
+mob or obj keywords. @RHELP COLOR-CODES@n.
  
 2. What the heck is a VNUM?
    A VNUM, or Virtual Number, is just a way to keep track of the items in the
@@ -790,15 +790,15 @@ modifies a room exit but does not include an exit room vnum. These errant
 rooms are listed by the command 'show error' The fix is simple, remove the 
 exit by purge exit in redit exit menu or by using 'dig <direction> -1'
 
-2: SYSERR: Object # (oedit-s-desc) doesn't have drink type as last alias. (oedit-namelist)
+2: SYSERR: Object # (oedit-s-desc) doesn't have drink type as last keyword. (oedit-keyword)
 
    Another common error is caused by how shop code handles drink containers 
 poorly. In order for shops to display a jug as a jug of <drink type> they 
-must have the drink type as the last alias. It is good practice to put the 
-drink type as the first and last word of an objects namelist (older versions 
+must have the drink type as the last keyword. It is good practice to put the 
+drink type as the first and last word of an objects keyword (older versions 
 of CircleMUD expect it first).
-i.e. a shot of whisky should have the namelist: whisky shot whisky
-     a cup of slime mold juice namelist should be: juice cup slime juice
+i.e. a shot of whisky should have the keyword: whisky shot whisky
+     a cup of slime mold juice keyword should be: juice cup slime juice
 
 3: SYSERR: Mob #5 both Aggressive and Aggressive_to_Alignment.
 
@@ -1640,17 +1640,17 @@ Usage: snoop [player]
 
 Snoop allows you to see everything another player types or can see. This will 
 be displayed on your terminal preceded by a '%'. To prevent abuse snooping 
-someone is logged in the system files and is viewable by any immortal with 
-syslog enabled.
+someone is logged in the system files.
 
-Snoop is meant to assist teachers in helping builders. It allows you to see
-what they are doing wrong and correct them. It should be used in conjunction
-with the send command. Snoop shall only be used to assist people when building.
+Snoop is meant to assist teachers in helping builders and to ensure players do
+not cheat. With builders it allows you to see what they are doing wrong and 
+correct them. It should be used in conjunction with the send command. Snoop 
+shall only be used to assist people when building and enforcing rules. It is
+not meant as a tool for spying.
 
 Type snoop <your name> or just snoop to stop snooping.
 
 See also: SEND
-
 #31
 SEND
 
@@ -1667,10 +1667,8 @@ With this I just type: sa <message>. This will use color to catch his attention
 and will list my name since send does not automatically show who the send is 
 from.
 
-Wiznet is now viewable while in OLC.
-
-Example:
-send Rumble You are being watched!
+Wiznet is now viewable while in OLC so if the MUD isn't too crowded you can use
+that as well, but do not spam other builders.
 
 See also: TRIG-SEND
 #31
@@ -1713,9 +1711,9 @@ See also: TBAMAP, MAPPING
 ABBREVIATIONS
 
    We have added abbreviations so you do not have to type everything exactly as
-it appears. This also means that when you enter keywords/alias/namelist in OLC
-you do not have to list all forms. i. e. the keyword rumble could be used to cover 
-anyone who types <action> rumble rumbl rumb rum ru.
+it appears. This also means that when you enter keywords in OLC you do not have
+to list all forms. i. e. the keyword rumble could be used to cover anyone who 
+types <action> rumble rumbl rumb rum ru.
 
 #31 
 ZONE-DESCRIPTION-ROOM ZONE_DESCRIPTION_ROOM 00 EXAMPLE-PROPOSALS EXAMPLE-ZONE-DESCRIPTIONS ZONE-INFO TEST-ZONE TRIAL-ZONE ZONE-DESCRIPTIONS ZEDIT-DESCRIPTION
@@ -2600,10 +2598,9 @@ The slowns command is deprecated after adding asynchronous host lookup.
 
 Huh? Slowns toggles whether or not IP addresses are resolved into readable 
 site names. If slow nameserver is enabled, USERS will show only IP 
-addresses. (128.123.222.111 etc).
+addresses. i.e. 128.123.222.111 and not ip.hr.hr.cox.net.
 
 See also: TOGGLE, USERS
-
 #31
 SWITCH
 
@@ -2726,20 +2723,19 @@ Usage: wizhelp
 Gives a list of the special commands available at your level.
 
 The following wizard commands are implemented with level in the brackets:
-[31];        [32]advance   [32]aedit     [31]at       [31]attach   [33]ban       [31]buildwalk
-[34]cedit    [32]checkload [33]copyover  [31]date     [32]dc       [31]detach    [31]dig      
-[31]echo     [34]edit      [34]export    [32]file     [32]force    [33]freeze    [32]gecho
-[31]goto     [31]handbook  [33]hcontrol  [32]hedit    [34]helpcheck[31]holylight [31]imotd    
-[31]invis    [32]last      [34]lastlist  [32]links    [31]load     [31]medit     [31]mlist    
-[33]mute     [31]nohassle  [33]notitle   [31]nowiz    [31]oedit    [31]olc       [31]olist    
-[32]pardon   [31]peace     [31]poofin    [31]poofout  [31]poofs    [31]purge     [34]qecho
-[31]rclone   [31]redit     [34]reload    [33]reroll   [31]restore  [31]rlist     [31]roomflag 
-[31]saveall  [31]sedit     [32]send      [32]set      [31]show     [34]shutdow   [34]shutdown 
-[32]skillset [31]slist     [34]slowns    [32]snoop    [31]stat     [32]switch    [31]syslog   
-[33]tedit    [32]teleport  [33]thaw      [31]tlist    [34]trackthru[32]transfer  [31]trigedit 
-[31]tstat    [32]unaffect  [33]unban     [32]users    [32]vdelete  [31]vnum      [31]vstat    
-[31]wiznet   [31]wizhelp   [34]wizlock   [32]zcheck   [31]zedit    [31]zlist     [32]zpurge   
-[31]zreset
+[31];         [32]advance   [32]aedit     [31]at        [31]attach    [33]ban       [31]buildwalk
+[34]cedit     [32]checkload [33]copyover  [31]date      [32]dc        [31]detach    [31]dig      
+[31]echo      [34]export    [32]file      [32]force     [33]freeze    [32]gecho     [31]goto
+[31]handbook  [33]hcontrol  [32]hedit     [34]helpcheck [31]holylight [31]imotd     [31]invis
+[32]last      [32]links     [31]load      [31]medit     [31]mlist     [33]mute      [31]nohassle
+[33]notitle   [31]nowiz     [31]oedit     [31]olc       [31]olist     [31]page      [32]pardon
+[31]peace     [31]purge     [34]qecho     [31]rclone    [31]redit     [34]reload    [33]reroll
+[31]restore   [31]rlist     [31]roomflags [31]saveall   [31]sedit     [32]send      [32]set
+[31]show      [34]shutdow   [34]shutdown  [32]skillset  [31]slist     [32]snoop     [31]stat
+[32]switch    [33]tedit     [32]teleport  [33]thaw      [31]tlist     [32]transfer  [31]trigedit 
+[31]tstat     [32]unaffect  [33]unban     [31]uptime    [32]users     [32]vdelete   [31]vnum
+[31]vstat     [31]wiznet    [31]wizhelp   [34]wizlock   [32]zcheck    [31]zedit     [31]zlist
+[32]zpurge    [31]zreset
 
 @RHELP <any of the above commands>@n
 #31
@@ -6199,7 +6195,7 @@ and English forms are both valid (5 or WEAPON, 9 or ARMOR, etc.).
    The second (optional) argument is called "OBJ-EXTRA FLAGS" and allows you
 to provide optional keywords to define specific keywords that must be present
 on the objects for the shopkeeper to buy or sell it. 
- CAPS means flags, lowercase means object namelist.
+ CAPS means flags, lowercase means object keyword.
    
 @n##              Type   OBJ-EXTRA FLAGS
    
@@ -6461,7 +6457,7 @@ equip the same position with more than one object.
 MEDIT-MENU MOB-MENU
 
 -- Mob Number:  [@c1300@n]                             @RHELP MEDIT-NUMBER@n
-1) Sex: @yneutral@n          2) Alias: @ymob unfinished@n  @RHELP MEDIT-ALIAS@n
+1) Sex: @yneutral@n          2) Keywords: @ymob unfinished@n  @RHELP MEDIT-KEYWORDS@n
 3) S-Desc: @ythe unfinished mob@n                      @RHELP MEDIT-S-DESC@n
 4) L-Desc:-
 @yAn unfinished mob stands here.@n                     @RHELP MEDIT-L-DESC@n
@@ -6504,27 +6500,27 @@ rash. Be creative.
 #31
 KEYWORDS
 
-   Mob aliases, and object namelists are keywords the player will use to
-interact with the mobs and objects. Such as "look Rusty" and "wield bludger"
-If you have more than one keyword separate them with spaces, not commas. They 
-should never include colorcodes or the words "look, look at, a, an, the, of, 
-some, etc." Only use keywords a player can figure out by the s-desc, l-desc,
-d-desc, or extra descriptions. Always make them unique, there are already 
-plenty of swords and citizens on most MUDs. 
+   Keywords are what the player will use to interact with the mobs and objects.
+Such as "look Rusty" and "wield bludger" If you have more than one keyword 
+separate them with spaces, not commas. They should never include colorcodes or 
+the words "look, look at, a, an, the, of, some, etc." Only use keywords a 
+player can figure out by the s-desc, l-desc, d-desc, or extra descriptions. 
+Always make them unique, there are already plenty of swords and citizens on 
+most MUDs. 
 
-See also: OEDIT-NAMELIST, MEDIT-ALIAS, EXTRA, COLORCODES
+See also: OEDIT-KEYWORD, MEDIT-KEYWORDS, EXTRA, COLORCODES
 #31
-MEDIT-ALIAS MEDIT-SEX MEDITNAME MOB-NAME MEDIT-ALIAS MOB-SEX 
+MEDIT-KEYWORDS MEDIT-ALIAS MEDIT-SEX MEDITNAME MOB-NAME MEDIT-ALIAS MOB-SEX 
 
 1) Sex: @yneutral@n 
    This is pretty self-explanatory. Male, Female, or Neutral. Remember if the
 mob is too small to determine its sex you should set it as neutral.  
 
-2) Alias: @ymob unfinished@n
-   An alias is the word you use to act on a mob. For example the alias: "Spike 
+2) Keywords: @ymob unfinished@n
+   A keyword is the word you use to act on a mob. For example the keyword: "Spike 
 dog black angry" would allow the following commands to work: kill Spike, look 
 black, consider angry, poke dog, etc. So many people get this wrong I will 
-rephrase it. Mob alias is a list of KEYWORDS which players can use to interact 
+rephrase it. It is a list of KEYWORDS which players can use to interact 
 with the mobile.  @RHELP KEYWORDS@n. 
 
 Examples: "sparkly golden dragon" "bassett hound fat"
@@ -6790,7 +6786,7 @@ See also: MEDIT-AFF-FLAGS
 #31
 OEDIT-MENU OBJ-MENU OBJECT-MENU
 -- Item number : [@c@c1300@n]                   @RHELP OEDIT-NUMBER@n
-1) Namelist : @yunfinished object@n           @RHELP OEDIT-NAMELIST@n
+1) keywords : @yunfinished object@n           @RHELP OEDIT-KEYWORDS@n
 2) S-Desc   : @yan unfinished object@n        @RHELP OEDIT-S-DESC@n
 3) L-Desc   :-       
 @yAn unfinished object is lying here.@n       @RHELP OEDIT-L-DESC@n
@@ -6823,10 +6819,10 @@ of the object within the game. It is the number that will be used to reference
 the object from zone files and is the number used to load objects from within 
 the game. 
 #31
-OEDIT-NAMELIST OEDIT-ALIASES OBJ-NAMELIST NAMELIST
+OEDIT-KEYWORDS OEDIT-NAMELIST OEDIT-ALIASES OBJ-NAMELIST NAMELIST
 
 
-1) Namelist : @yunfinished object@n
+1) keywords : @yunfinished object@n
    The list of keywords players can use to interact with the object.
 @RHELP KEYWORD@n.
 
@@ -6880,8 +6876,7 @@ Potions: Rumble quaffs <object>.
    I guess this needs to be repeated once more. A-desc does not normally need 
 to be set. Except for the few instances listed above. It is not the object's
 equivalent of the D-desc. If you want someone to see something when they 
-look at the object add it in the extra description menu with keywords the 
-same as the namelist.
+look at the object add it in the extra description menu with the same keywords.
 
 A-desc is not seen by the person using the object. Only by the victim and other
 players in the room. The following variables can be used with it. 
@@ -7344,8 +7339,8 @@ additional detail by typing "look wall."  Choosing this option will bring you
 to the extra descriptions menu: 
 
 1) Keyword: @y<NONE>@n
-   This is the same as an alias or namelist. Simply the <thing>. Do
-not use a/an/the/look/read in this field.
+   List the words you want people to use to interact with it. Simply the 
+<thing>. Do not use a/an/the/look/read in this field.
 
 2) Description:
 @y<NONE>@n
@@ -7388,7 +7383,7 @@ These must always be complete sentences. For example, "You see the
 main chamber of the temple." These can really flesh out a zone.
 
 3) Door name   : @yNONE@n
-This is an alias field. An alias is the word you use when you perform
+This is a keyword field. A keyword is the word you use when you perform
 an action. Such as opening and closing. It can be more than one word, but
 the first word is the only one displayed in the output messages. i.e. Rumble
 opens a <Door name>.
@@ -7607,7 +7602,7 @@ at 100 objects and "You see nothing special..." all 100 times. In an effort to
 make all MUDs different and better, take the time to write an extra description
 for your object. Think of an objects extra description as the same thing as a
 mobs description when you look at it, which it actually is. For the extra
-descriptions keywords, use the same words as used in the objects namelist. 
+descriptions keywords, use the same keywords as you did earlier. 
 A very easy way to detect lazy builders with bad grammar is when objects
 have no description at all. This causes frustration on the player side, because
 when you have seen "You see nothing special..." once too many, you just do not
@@ -10506,7 +10501,7 @@ Usage: toggle
 TOGGLE shows you the current values of various toggles available on the MUD.
 This command can also be used to change these values, if used with the correct
 argument. When a toggle is set, it will be saved in that state until the next
-time you change it.
+time you change it. Level IMP toggle includes:
 
  SlowNameserver: OFF                            Trackthru Doors: ON 
       Buildwalk: OFF              NoWiz: OFF             ClsOLC: OFF
@@ -10973,7 +10968,7 @@ Thanks to ...
 Share and enjoy.
 MERC Industries
 #0
-HEIACH XTBAX
+HEIACH XTBA
 
 Heiach has been a big help with training new builders and has become very adept
 with trigedit. His example zone 359 is very impressive. He is always willing to
diff --git a/lib/text/immlist b/lib/text/immlist
index 0ed9fc2..9fec529 100644
--- a/lib/text/immlist
+++ b/lib/text/immlist
@@ -1,8 +1,5 @@
  *************************************************************************
- * The following people have reached immortality on CircleMUD.  They are *
- * to be treated with respect and awe.  Occasional prayers to them are   *
- * advisable.  Annoying them is not recommended.  Stealing from them is  *
- * punishable by immediate death.                                        *
+ *       The following people have reached immortality on tbaMUD.        *
  *************************************************************************
 
                                    Immortals
diff --git a/lib/text/imotd b/lib/text/imotd
index c246bba..a58fe78 100644
--- a/lib/text/imotd
+++ b/lib/text/imotd
@@ -1,6 +1,6 @@
 (lib/text/imotd)
 
-Welcome to CircleMUD 3.5!
+Welcome to tbaMUD!
 
 This is the immortal MOTD -- the file that immortals will see when they
 log in to the game.  You should change it to something more interesting
diff --git a/lib/text/news b/lib/text/news
index 7e26b45..f1b8b9b 100644
--- a/lib/text/news
+++ b/lib/text/news
@@ -1,8 +1,8 @@
 (lib/text/news)
 
-			    THE CIRCLEMUD HERALD
+			    THE tbaMUD HERALD
    		 "We addict players for their own enjoyment."
-			     December, 2006
+			      January, 2007
 
 
 NEW COMMANDS AND NEW MUD BEHAVIOR:
diff --git a/lib/text/wizlist b/lib/text/wizlist
index 6677297..f5f1e9a 100644
--- a/lib/text/wizlist
+++ b/lib/text/wizlist
@@ -1,8 +1,5 @@
  *************************************************************************
- * The following people have reached immortality on CircleMUD.  They are *
- * to be treated with respect and awe.  Occasional prayers to them are   *
- * advisable.  Annoying them is not recommended.  Stealing from them is  *
- * punishable by immediate death.                                        *
+ *        The following people have reached immortality on tbaMUD.       *
  *************************************************************************
 
                                  Implementors
diff --git a/src/boards.c b/src/boards.c
index caeec06..a35a226 100644
--- a/src/boards.c
+++ b/src/boards.c
@@ -192,9 +192,8 @@ SPECIAL(gen_board)
 
 int Board_write_message(int board_type, struct char_data *ch, char *arg, struct obj_data *board)
 {
-  char *tmstr;
   time_t ct;
-  char buf[MAX_INPUT_LENGTH], buf2[MAX_NAME_LENGTH + 3];
+  char buf[MAX_INPUT_LENGTH], buf2[MAX_NAME_LENGTH + 3], tmstr[MAX_STRING_LENGTH];
 
   if (GET_LEVEL(ch) < WRITE_LVL(board_type)) {
     send_to_char(ch, "You are not holy enough to write on this board.\r\n");
@@ -221,11 +220,10 @@ int Board_write_message(int board_type, struct char_data *ch, char *arg, struct
     return (1);
   }
   ct = time(0);
-  tmstr = (char *) asctime(localtime(&ct));
-  *(tmstr + strlen(tmstr) - 1) = '\0';
+  strftime(tmstr, sizeof(tmstr), "%a %b %d %Y", localtime(&ct));
 
   snprintf(buf2, sizeof(buf2), "(%s)", GET_NAME(ch));
-  snprintf(buf, sizeof(buf), "%6.10s %-12s :: %s", tmstr, buf2, arg);
+  snprintf(buf, sizeof(buf), "%s %-12s :: %s", tmstr, buf2, arg);
   NEW_MSG_INDEX(board_type).heading = strdup(buf);
   NEW_MSG_INDEX(board_type).level = GET_LEVEL(ch);