fixed (i hope) etymology-related bugs