elliminated an error
modified function definition
modified defs.h
fixed some errors
fixed some errors
fixed merging errors