[Updates] Update Makefile, areas, and data files

Several updates to area files, data files, and the make file.  Also
started some revisions in act_wiz.c